Adwaita: fix for the previous colorswatch fix...

Make the selected colorswatch inhert on backdrop.

diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 2216e28372ada899e0ad7ad3a9eb877f81237aaf..498111389e4842230450275bb908b6975d15a7ac 100644 (file)
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -2969,7 +2969,8 @@ GtkColorSwatch {
     box-shadow: inset 0 1px transparentize(white, 0.6),
                 inset 0 -1px if($variant == 'light', transparentize(black, 0.9), transparentize(black, 0.6));
   }
-  &:backdrop {
+  &:backdrop,
+  &:backdrop:selected {
     background-image: none;
     box-shadow: none;
   }

diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 892b18d2ef07d975f31574dfeee370c368bbb8e9..543fa3438a443d9bbcae3ba5c22dbbe214739b1c 100644 (file)
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -4377,7 +4377,7 @@ GtkColorSwatch {
   GtkColorSwatch:hover, GtkColorSwatch:hover:selected {
     background-image: linear-gradient(135deg, rgba(255, 255, 255, 0.7), rgba(255, 255, 255, 0) 50%);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.4), inset 0 -1px rgba(0, 0, 0, 0.4); }
-  GtkColorSwatch:backdrop {
+  GtkColorSwatch:backdrop, GtkColorSwatch:backdrop:selected {
     background-image: none;
     box-shadow: none; }
   GtkColorEditor GtkColorSwatch {

diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index e9ee1d29b119b763ae5ae0f76e2cf459b54c5deb..6116c3759c3ef1a6410ad04a00dd9d86fe416ff5 100644 (file)
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -4538,7 +4538,7 @@ GtkColorSwatch {
   GtkColorSwatch:hover, GtkColorSwatch:hover:selected {
     background-image: linear-gradient(135deg, rgba(255, 255, 255, 0.7), rgba(255, 255, 255, 0) 50%);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.4), inset 0 -1px rgba(0, 0, 0, 0.1); }
-  GtkColorSwatch:backdrop {
+  GtkColorSwatch:backdrop, GtkColorSwatch:backdrop:selected {
     background-image: none;
     box-shadow: none; }
   GtkColorEditor GtkColorSwatch {